Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Wed, 25 Dec 2013 22:27:00 +0000 (06:27 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Wed, 25 Dec 2013 22:27:00 +0000 (06:27 +0800)
commit20b95695d746d018b972e9f8eb63076d5cd003d4
tree5a271f85b20beac0235540a17cce8c660bb1ec43
parent41db283eb37072b24772406007f7c2f5aaea2279
parent6cf5ea19c4985640d021cd7ff7bef5e13c313352
Merge from mainline.